Revision: bazaar--devel--1.1--patch-56
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Tue Jan  4 12:18:12 EST 2005
Standard-date: 2005-01-04 01:18:12 GMT
Modified-files: libarch/cached-archive.c libarch/merge.c
    libarch/my.c
New-patches: aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-5
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-6
    rob.weir@canonical.com--2004-public/baz--bug4889--0--base-0
    rob.weir@canonical.com--2004-public/baz--bug4889--0--patch-1
    rob.weir@canonical.com--2004-public/baz--bug4889--0--patch-2
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-56
    thelove@canonical.com/bazaar--devo--1.1--patch-64
    thelove@canonical.com/bazaar--devo--1.1--patch-65
    thelove@canonical.com/bazaar--devo--1.1--patch-66
    thelove@canonical.com/bazaar--devo--1.1--patch-67
Summary: merge from thelove@canonical.com/bazaar--devo--1.1
Keywords: 

Patches applied:

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-5
   Merge from thelove

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-6
   Fixed memory allocation error

 * rob.weir@canonical.com--2004-public/baz--bug4889--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-63

 * rob.weir@canonical.com--2004-public/baz--bug4889--0--patch-1
   Apply patch from James Hentridge to use size_t instead of int.

 * rob.weir@canonical.com--2004-public/baz--bug4889--0--patch-2
   Sync up with THELOVE.

 * thelove@canonical.com/bazaar--devo--1.1--patch-64
   Fixed error in memory allocation for cached archives

 * thelove@canonical.com/bazaar--devo--1.1--patch-65
   Fixed error in memory allocation for cached archives (for real)

 * thelove@canonical.com/bazaar--devo--1.1--patch-66
   Use size_t instead of int in one case, to fix a build failure on amd64 (#4889).

 * thelove@canonical.com/bazaar--devo--1.1--patch-67
   Use size_t instead of int, fixing a build failure on amd64 (thanks James Henstridge, #4889).  Archive-mirror'ing this time.

